Fixed a conflict between branches