Fixed umerged conflict