Fixed all the conflicts