merge with remote
add i3 configs