I think web storm auto mergered the file