fix bug in log in and posting new
merge