Cleaned up after git clash