took care of merge conflicts