merge issues caused code problems. Resolved