such fegit merge git shit

Signed-off-by: smiw314 <samuelwambera@gmail.com>