Fixed some git conflicts