cleaned up merged changes