Fixed git conflicts

-