Fixed git conflicts