Fixed commit conflict