Fixed commit conflicts