Fixed results of poor merge