fixed issues with merge