Merge temporary development branch