Fixed all merge problems