Three-way merge .pacnew file - View it on GitHub