Cleaned up my merge fails