sexy button
resolve color merge conflict