Merge features branch