Fixed git error. Please pull before doing anything else