Still fixing merge issues