Resolved merge conflict in src/Makefile.am