Fixed all merge errors