Cleaned up conflicts that were left behind