fix yank actions using the default clipboard
fix merging conflicts
adds bundle folder to the ignore list