Solve merge conflict on coin-slider