Fix for branches conflict.