Removed conflict comments from src/lib/Libdis/Makefile.am