I think my intellij automatically merged them.

Recently I have been seeing more 'smart' stuff.

E.g. when I type an incomplete statement, and jump a few lines down... intellij correct the code by throwing away the incomplete statement. Don't know if this is a feature or a bug :)