No really. This one should fix your merge conflict.