Fixing branch conflict