Checkout conflict resolving
''
fixed