Solving correctly Makefile.am conflict in the last merge with master