Removed unintended branch merge