Fixed all merge issues