Fixing merge confict