Added maps
Solved conflicts