Undo port
Fixed the white navbar on AR side
Dealing with some delete conflicts - part 1
Dealing with some delete conflicts - part 2