Changed sanki's name
Resolved conflicts