Select square is not working yet
Merge conflict