cleaned up rouge merge lines