some changes to fix merge occuring by merging