Merged master in slam