Fixing mergin conflict.