Fixed issue with commit conflict