fixed problems from merge conflict