Fixing minor merging issues