code: merging fix