Resolving conflict when merging master with mras branch