Hmmmm git merging error should be fixed XD