Fixed address problem
Resolved merging conflicts