Merge not done properly!!!