merging - resolving conflicts + fixing bugs