Solved conflicts with Github repo