Added modal button
Fixed merge conflict