code fix merging