Cleaned up conflict headers