Removed merge conflict.