Fixed an unresolved conflict.