fixing merge/conflict problem