removed button
resolved conflicts