removed merging bug, final commit