way better looking fence
fixing some merge conflict stuff
jade spacing issues