Commiting local branch
Fixed some merge issues