OverLayout on maps markers
fixed error merge conflicts