still trying to fix merge issues