Cleaned up conflicts