Merged master and branch